Merge branch 'master' into xwidget

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge